Cherry-pick #8973 to 6.x: Minor Journalbeat fixes and additions #9007
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
### Refactoring of option `seek` Previously, the option was string, so deciding which seeker function has to be called used string comparisons. I added `SeekMode` so the mode can be an `iota` and provided its own `Unpack` function. This also takes care of validating the user configured value. ### Field renaming I renamed `custom.*` prefix to `journald.custom.*`, so users know where those custom fields are coming from. ### Dashboard It is a minimal dashboard with a few predefined searches. When modules are available to parse messages coming from journald, it is going to be possible create prettier visualizations. ### Skip last event when `seek` is set to `tail` Previously, if `seek` was set to `tail`, the last event in the journal was read. Now this last event is skipped to avoid duplication. ### Unstoppable Journalbeat (haha) If the output was unreachable Journalbeat got stuck when it retried to connect to the output. As the Beat never stops trying, it never returned from the last `client.Publish` call. Thus, `publishAll` function never stopped, because it never received any signal from the `done` channel of the input. The client of each input is closed during `Stop` of each input. ### Registry file path Previously, Journalbeat put its registry file under `/registry` when installed from deb package. From now the registry file resides under the folder specified by `-path.data`. (cherry picked from commit 7fee516)
jsoriano
approved these changes
Nov 9, 2018
| @@ -87,6 +88,8 @@ func NewCheckpoint(file string, maxUpdates int, interval time.Duration) (*Checkp | |||
| save: make(chan JournalState, 1), | |||
| } | |||
|
|
|||
| c.file = paths.Resolve(paths.Data, c.file) | |||
There was a problem hiding this comment.
This could have been set directly on c initialization.
kvch
added a commit
that referenced
this pull request
Nov 28, 2018
…9275) * Revert "Minor Journalbeat fixes and additions (#8973) (#9007)" This reverts commit 7c6081d. * Add missing journalbeat non breaking fixes (#9106) Backported from master: * refactoring of `SeekMode` * journalbeat can be stopped when no output is available * add dashboard ++ add deprecation warnings for options I want to remove in 7.0 (cherry picked from commit f7638a5)
DStape
pushed a commit
to DStape/beats
that referenced
this pull request
Aug 20, 2019
### Refactoring of option `seek` Previously, the option was string, so deciding which seeker function has to be called used string comparisons. I added `SeekMode` so the mode can be an `iota` and provided its own `Unpack` function. This also takes care of validating the user configured value. ### Field renaming I renamed `custom.*` prefix to `journald.custom.*`, so users know where those custom fields are coming from. ### Dashboard It is a minimal dashboard with a few predefined searches. When modules are available to parse messages coming from journald, it is going to be possible create prettier visualizations. ### Skip last event when `seek` is set to `tail` Previously, if `seek` was set to `tail`, the last event in the journal was read. Now this last event is skipped to avoid duplication. ### Unstoppable Journalbeat (haha) If the output was unreachable Journalbeat got stuck when it retried to connect to the output. As the Beat never stops trying, it never returned from the last `client.Publish` call. Thus, `publishAll` function never stopped, because it never received any signal from the `done` channel of the input. The client of each input is closed during `Stop` of each input. ### Registry file path Previously, Journalbeat put its registry file under `/registry` when installed from deb package. From now the registry file resides under the folder specified by `-path.data`. (cherry picked from commit 7fee516)
DStape
pushed a commit
to DStape/beats
that referenced
this pull request
Aug 20, 2019
… fixes (elastic#9275) * Revert "Minor Journalbeat fixes and additions (elastic#8973) (elastic#9007)" This reverts commit 7c6081d. * Add missing journalbeat non breaking fixes (elastic#9106) Backported from master: * refactoring of `SeekMode` * journalbeat can be stopped when no output is available * add dashboard ++ add deprecation warnings for options I want to remove in 7.0 (cherry picked from commit f7638a5)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-pick of PR #8973 to 6.x branch. Original message:
Refactoring of option
seekPreviously, the option was string, so deciding which seeker function has to be called used string comparisons. I added
SeekModeso the mode can be aniotaand provided its ownUnpackfunction. This also takes care of validating the user configured value.Field renaming
I renamed
custom.*prefix tojournald.custom.*, so users know where those custom fields are coming from.Dashboard
It is a minimal dashboard with a few predefined searches. When modules are available to parse messages coming from journald, it is going to be possible create prettier visualizations.
Skip last event when
seekis set totailPreviously, if
seekwas set totail, the last event in the journal was read. Now this last event is skipped to avoid duplication.Unstoppable Journalbeat (haha)
If the output was unreachable Journalbeat got stuck when it retried to connect to the output. As the Beat never stops trying, it never returned from the last
client.Publishcall. Thus,publishAllfunction never stopped, because it never received any signal from thedonechannel of the input.The client of each input is closed during
Stopof each input.Registry file path
Previously, Journalbeat put its registry file under
/registrywhen installed from deb package. From now the registry file resides under the folder specified by-path.data.